(rmail-output-to-rmail-file): Avoid multiple output of last undeleted

message.

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index a029f5e192ab3c42b4382b804610c715a257c73a..4a7e07ecf850a74343e66bdb3ff692733a54902a 100644 (file)
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -178,9 +178,9 @@ starting with the current one.  Deleted messages are skipped and don't count."
          (if redelete (rmail-set-attribute "deleted" t))))
       (setq count (1- count))
       (if rmail-delete-after-output
-         (rmail-delete-forward)
+         (unless (rmail-delete-forward) (setq count 0))
        (if (> count 0)
-           (rmail-next-undeleted-message 1))))))
+           (unless (rmail-next-undeleted-message 1) (setq count 0)))))))
 
 ;;;###autoload
 (defcustom rmail-fields-not-to-output nil